Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 23:35:16 +0000 (23:35 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 23:35:16 +0000 (23:35 +0000)

Trivial merge